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

Change-Id: Id15d20805fd1e8eb7629612c6ef6934743c5451b