Merge "Merge "Merge "Finish fixed rotation while the task has done transition" into rvc-dev am: 1a3468740a am: eb4731a06c" into rvc-d1-dev-plus-aosp am: b45df911a7" into rvc-qpr-dev-plus-aosp