Merge "Restore config of associated window when clearing fixed rotation" into rvc-dev