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