Controlgroup: Target buttons inside the controlgroup-controls container only. Fixes #5352. Changes from PR #5821 with some modifications. Thanks @aristotelos !