Merge "Move the wallpaper beneath the keyguard." into klp-dev