Merge "Fix color picker section showing no wallpaper color on build" into tm-qpr-dev