Fixes #20999 (closed).
Move margin from adjacent selector to right on the .custom-control for better responsive rendering.