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

Change-Id: Ia6d1b8cfa2c5d126b702eb84895093fa3f893b00