Merge "Dynamically adjust the paddings of the contextual buttons" into main