Merge "Merge "Finish fixed rotation while the task has done transition" into rvc-dev am: 1a346874 am: 9b5948f6 am: 0e00683b" into rvc-qpr-dev-plus-aosp