Merge "Lose start/stop to toybox."