screen off fixes

Change-Id: Ia4629a4f53706be233acc3ad716945833174a3c6
v7 kernel

Change-Id: I26bae3b74945eb575d490085e601472ff7be4663