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

Change-Id: I72e920090a147053bf7e6e61adb720c908bcd9c4