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

Change-Id: I7204eae9829d1e5ddc6f92ea6d358a62abc282a3