more fixes for active display

fix pocket mode not turning the screen on
fix the top notification preview not changing when notifications are dismissed

Change-Id: I78d9627012b18d867696457f5a0511c5752e8523
Merge remote-tracking branch 'upstream/kk44' into kk44