Merge "Merge "Finish fixed rotation while the task has done transition" into rvc-dev am: 1a346874 am: eb4731a0" into rvc-d1-dev-plus-aosp