am 56d46cc9: Merge "Fix global screen rotation issue."

* commit '56d46cc95f761eabc6455f3e391835936b7d05e8':
  Fix global screen rotation issue.