Merge "UI refresh for reply with sms bottom sheet." am: 1c2630958c
am: a3535c05c3

Change-Id: I4faee656479c82da84dd35be03988837cf106d41