Merge "Fix issue #5242779: Device not responding to touch on unlock screen"