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

* commit '482635e34d0def1682ebc644db0636862994f649':
  Fix deadlock when updating rotation