am 7ebda6f1: Merge change 3265 into donut

Merge commit '7ebda6f110708bdb704f8700a6b3473249b12baf'

* commit '7ebda6f110708bdb704f8700a6b3473249b12baf':
  A workaround to fix rotation issue. I'm remote now and hard to do troubleshooting (i cannot rotate emulator in nx..)