Merge "Partially fix the keyguard scrim" into lmp-dev