Active display: Next try to fix "turn off display if device gets pocketed again"

& cleanup

Change-Id: Ice9354faf4a939f31a5bd590031ee001a62712fb
Active display: Fix visible NavBar buttons on LockScreen

Change-Id: Ibb1ab5af2a5083357bfb1740458816c741c4995c

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java