Merge "Fix some flakiness with rotation" into rvc-dev