Merge "Update suggested wallpaper dimensions in onResume" into jb-ub-now-kermit