Merge "Track size changes correctly for static wallpapers" into jb-mr1-dev