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

* commit '13cb6dc9abd55e1a383c06ff60d6ab4db8ddfc0b':
  Conversation footer buttons should be wrap content