Fixes a bug where the lockscreen would be frozen

When a finger was still on the screen while the screen
turned off the screen could become frozen and only recovered
by launching the camera gesture.

Change-Id: Ie7dea4152adff46f4499d3e8c4ac237f504f21eb
Fixes: 29773218
Fixes: 30154665