Merge "Remove unused config toggle for hiding the clear-all button." into main