Merge "Apply rotation animation when canceling fixed rotation" into sc-dev