Merge "Updating default wallpaper for non-xlarge devices. (Bug 6460469)" into jb-dev