Merge \\"Change approach for windowPositionLostRT\\" into nyc-dev am: 16038a0c5f
am: 0a3a75e121

Change-Id: I579930de1951b2112ce51016007a0358067f9934