Merge "Fix crash when rotating screen in a few screens." into nyc-dev