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

* commit 'b93da8d6e76657dfed890f58f49fe16bf8b9a0e4':
  Fix bugs / jank with folder creation feedback (issue 11195148)