Disallow uniqXXXXStates in aggregation, then fix root cause to allow it back.

Disallow building uniqXXXXStates of other aggregation states. #24523 (Raúl Marín). Then allow it back by actually eliminating the root cause of the related issue. (alexey-milovidov).