Merge "Making wallpaper width 2x the screen width" into ics-factoryrom