add reset on suspend toggle, reorganize device menu

Change-Id: I7971b0f62e9a69ae31d7565148f98706f59d8571
bump versioncode

Change-Id: I3e1c20e2f305c37e6a3019977b74d9a0c1492aae