Merge "Update tablet wallpaper size" into ics-mr1