Merge "Add icon for more settings preference" into main