Readded rotation crash fix

Change-Id: I83d166f0364175bef738daf8274f92d86ca33718