Move sweep2wake toggle to appropriate place

Change-Id: Ie5788d83f1cc98d54bf9b162fd1fca18d1ddd65c
move toggles to appropriate menus

Change-Id: I6dbc74f70a863637994ddf4b3063b97754010826