am bae7a41c: am 3a6c7feb: Merge "Compose button is only visible in regular convlist" into ub-gmail-ur14-dev

* commit 'bae7a41cd7ce9e48ee9655a980dc3280c6183e06':
  Compose button is only visible in regular convlist