Merge "Add a header before the icon list in the new/rename mode screen" into main