Merge "Reduce height of folder color swatch" into jb-ub-mail-ur9