Merge "Kill action mode before changing root." into oc-dev
am: 99a54cc484

Change-Id: I6ec26ff8766563b4c22038762636b3d6f0d7e3bc