Merge "Fix fingerprint listening delay when locking phone"