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

Change-Id: I55ab2a2736953b474032e100eb3314e2ca0b0b21