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

Change-Id: Ibc6aea6b9126639a44b36466a2efcfbe0dd8d267