Merge "Add reset wm shell command to reset all"