Merge "Fix crash on rotation" into pi-dev am: 3bdd65e255
am: 60aa99a95c

Change-Id: I02a301bd9a83491acdf3c76e94a15253a3191e83