Merge "Dedup smart reply updates for bubble flyout [DO NOT MERGE]" into qt-qpr1-dev
am: 51a159329f

Change-Id: Ic31e617c498ca4e8a6ea98371ff0f8ba22c0bd7c