Merge "Move updating window position off RT" into nyc-dev