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

Change-Id: I4a0548757f366a24113bea9aaa70ae0d6f53db12