Revert "D800's screen won't stay off... so I'm playing difference wackamole until it works."

doesn't give issues so can be added back
This reverts commit 3833090f22bd725c4b5d6aa4b2a62b9013888829.

Change-Id: I83cf1dc6d8b9516f683abb28962937acc1de1b5e
Revert "enable input resampling"

can be added back
This reverts commit 7e245fd2f351d05e532d200937a1db5d4fef0ab7.

Change-Id: Ib35e646bfc0c761c859005308258083edfb4fea8
Merge "Revert "enable input resampling"" into kk44
Merge "Revert "D800's screen won't stay off... so I'm playing difference wackamole until it works."" into kk44