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