am 14cdc7a8: am ea851e96: am 10de4207: am 3c326cf8: am 156fbff4: am 7f331b6b: Merge "Change folder icon item overlay to white (issue 11030725)" into jb-ub-now-indigo-rose

* commit '14cdc7a86779a3c32f76cd604f90cae394abd8bd':