Merge "Show "Folder settings" based on capabilities"