Merge "Also reverse rotation for #freezeRotation path" into udc-dev