Merge "Revert "Deprecating: Consolidating `progressive` & `constructive` buttons""