am 52e6d458: am 430778bd: am 482635e3: Merge "Fix deadlock when updating rotation" into mnc-dr-dev

* commit '52e6d458d6cf0af7bda45cb80262af6fc369799f':
  Fix deadlock when updating rotation