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

* commit '32a0aa2ea2970393723edfb239fb9be9b20f1be7':