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

* commit '430778bd75a735324b4ea7447a19268fe09e00e8':
  Fix deadlock when updating rotation