Rollup merge of #60362 - Centril:cleanup-declare-features-active, r=oli-obk

Cleanup 'active' declare_features! with uniform style + sorting.

r? @oli-obk

(added the FIXME you wanted)
cc #60354
cc #60361

Author: Centril