Combine into on set of TouchWake Settings

Change-Id: I28d07f6e97641f974c005e3f5f67b4c4b184cbe8