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

Change-Id: I4330c01e6e7df0f74de8659fe64c2720c180e991