Cleanup button wake settings (1/2)

Change-Id: I972251384eee15cf9e4915cd82d189ed7ef3050d