Merge "Kill action mode before changing root." into oc-dev