Check before the user is unlocked before handling proxied events
am: fd378d79e5

Change-Id: I1256df25f5f34cf89b1ec5707f79ee14c0184268