Merge "Finish rotation controller if the transition becomes no change" into main