Merge "Change folder swatch to 6dips" into jb-ub-mail-ur9