Merge "Ensure we leave the orientation changing state." into oc-dr1-dev