Merge "Allow extra height for the smartreply buttons" into pi-dev am: 85678bfbbd
am: a17a7cefaf

Change-Id: Ib19f8cd0f20a0792c6fca8b924391a80600d2507