Merge "Fix cropping wallpaper too small issue" into tm-dev