Merge "Split Keystore's onLockScreenEvent into onDevice{Unlocked,Locked}" into main