Merge "Fix crash on rotation." into nyc-dev am: 075690875b
am: 3d18e1991a
* commit '3d18e1991a29b18f84d8859cebf8736d050f8c10':
Change-Id: Idc7092febf05500167c82566a77f01fe6fa2efda
This commit is contained in: