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

Change-Id: I6b5c09d11796f9dd07701ee647c0cb7daa0b46d3