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