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

BART... HELLLOOOOO

Change-Id: I64777eacfec0f298437d80cada5d2c10e85b4ba6