am 12f583b4: Merge "Keep selected wallpaper on configuration change." into jb-ub-now-kermit

* commit '12f583b487e445a886d7c23cd76f4cadfdc5d4e2':
  Keep selected wallpaper on configuration change.