Merge "Fixes spacing of color options in wallpaper picker." into tm-qpr-dev