am 31df32be: am 81d39be5: am ad54d991: am 58df6d4e: am 22ea6504: Merge "Use ViewMode in TPL instead of manually checking conv" into ub-gmail-ur14-dev

* commit '31df32bed8f4cdb77ca8af91da58c18cccf5d43a':
  Use ViewMode in TPL instead of manually checking conv