Merge "Keep selected wallpaper on configuration change." into jb-ub-now-kermit