Merge "Stop keyguard from spamming the log" into lmp-mr1-dev