am 79a0ed58: Merge "Move the wallpaper beneath the keyguard." into klp-dev

* commit '79a0ed5848379b1f587bcc55a8a8b9417df6303b':
  Move the wallpaper beneath the keyguard.