Merge "Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev am: 956647ec3e" into oc-dr1-dev-plus-aosp