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

Change-Id: I8980b0d29fde42a8caf402d09db8537fddb7ac60