Merge "Restrict when a window receives new Configurations." into oc-mr1-dev am: d71227355e
am: 9626a900da

Change-Id: If2664499c9f4233fbbdea7b488fed761d6faf1c1