am b00b4be5: am 221433ab: Merge "Partially fix the keyguard scrim" into lmp-dev

* commit 'b00b4be5d978ea63aa0428772dbe5e593659a48f':
  Partially fix the keyguard scrim