Fix home/menu unlock with long press hardware key

- Forward port of commit 2a572ee7587cb0b686871e95567313aa8bc8bfd5

Change-Id: Ic2eb85542f8052fe1662244fe5e72ba12a98608b