am ad1d8b68: am 1db8cf12: Merge "Toggle wallpaper window flag when setting custom keyguard background" into klp-dev

* commit 'ad1d8b68b6286f88be510d23f7dcfa4cd6dc5b36':
  Toggle wallpaper window flag when setting custom keyguard background