Merge "Fix crash when rotating in multi-window mode." into nyc-dev am: 581a228372
am: 3ae96377da

* commit '3ae96377da4c3602da7352b87446c636a6163c6d':
  Fix crash when rotating in multi-window mode.