Merge "Logging of keyguard actions into security log"