Merge "Add "supports settings" to EAS mail folders"