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

Change-Id: Iaff54dcb133a4169f70f7ea2d7ded68cc313e946