Merge "Force pinned windows to always be scaleable." into nyc-dev