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

* commit '581a228372d0c84a70bbb5c2215f00dd290e5194':
  Fix crash when rotating in multi-window mode.