Merge "Tweak the sizes of the smart reply buttons" into pi-dev