Merge "Do not reset shelf offset during fixed rotation" into rvc-dev