Merge "Optimize handling of scrolled wallpapers" into ics-mr1