Merge "Do not skip finishing async rotation by a non-rotation transition" into udc-qpr-dev