Merge "Do not use rotation as indicator to relaunch from config change." into oc-dr1-dev am: fa62d79a02
am: b3d51770d1

Change-Id: I267b6be7a95c19b927e8ecb01e597342e6bee1d3