Merge "Move keyguard lock callback listener to AuthController" into main