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 '10de42077d4b45a9399d510fccc36d3debb86567':