Most of the changes, except screen brightness/power off

Change-Id: Ief4fcf9cda9b078da57aa4056f825370a504c550