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

* commit '7c8eb2b9df3c0820c02421ab5ff3b11150bb9f12':
  Fix deadlock when updating rotation