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

Change-Id: I5dda589d25d114bf3355886c29e6d1325a5250ad