Merge "Revert "bc25: impl baseline button styling Filled & Filled_Tonal"" into main