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

Change-Id: I55bd776503754ada24c75ad6a2b33f4044bb6139