Merge "Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev am: 33d4702a am: 69aac0a7" into oc-mr1-dev-plus-aosp