Merge "Fix folder name touch target size" into main