Merge "Disable default focus highlight for Folder to fix the incorrect border issue" into main