Use getControlGroups()
Merge remote-tracking branch 'remotes/upstream/staging' into patch-14
Use non-deprecated method
Perform same change to modal.php
Merge pull request #3213 from wilsonge/patch-14

[#33391] Use getControlGroups()