am 35eda31a: am 0b89db90: am 8dce08ac: am 49a9f34f: am 13cb6dc9: Merge "Conversation footer buttons should be wrap content" into ub-gmail-ur14-dev

* commit '35eda31a737fcff61455f5fa05c74be5e4027969':
  Conversation footer buttons should be wrap content