Active display: turn off display if device gets pocketed again

Change-Id: Ib05112b6b76a08fa1826daa098664563dcf414ae
Merge "Active display: turn off display if device gets pocketed again" into jb-mr2