Merge "Fix crash when rotating in multi-window mode." into nyc-dev