Merge "Test Week - FolderAccessibilityHelperTest" into main