am 27470623: am b93da8d6: am 01c0214f: Merge "Fix bugs / jank with folder creation feedback (issue 11195148)" into jb-ub-now-indigo-rose

* commit '274706233390aca870ac0bbc6f1a2d600ce03e62':