Merge "Use current rotation for snapshot of canceling fixed rotation" into sc-dev