am 49a9f34f: am 13cb6dc9: Merge "Conversation footer buttons should be wrap content" into ub-gmail-ur14-dev

* commit '49a9f34f0217eb9a01281bfad60395c71649c658':
  Conversation footer buttons should be wrap content