Merge "Change approach for windowPositionLostRT" into nyc-dev