Merge "Avoid entering orientation changing state when seamlessly rotating." into oc-dr1-dev