Merge "Allow extra height for the smartreply buttons" into pi-dev