Merge "Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am: f867733d4f am: 50caf4af60" into oc-dr1-dev-plus-aosp
am: 3b0ceaf0b1

Change-Id: I6f64c86786c9bf33587586b7aed5164e8d1fdde8