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