Merge "Use dimension for the selected button padding" into main