Merge "Fix deadlock when updating rotation" into mnc-dr-dev