Fixing crash during rotation
am: bb702584fa

* commit 'bb702584fa551fab8cffbb0ae5459d9efd16ce2a':
  Fixing crash during rotation