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

Change-Id: Id424bf6f16c7fe60607c78189239cb223e8984fd