Merge "Tweak the sizes of the smart reply buttons" into pi-dev am: d2925ac6fb
am: c004a331af

Change-Id: I3ae8b3dbbe47cb6687a995c8a4459fb694db8102