Merge "Merge "Ensure we leave the orientation changing state." into oc-dr1-dev am: 1eee2b49" into oc-mr1-dev