Merge "Defer rotation update during recent transition" into tm-dev