Merge "Add background check for password entry in Keyguard" into main