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

* commit '81d39be55a808acd30bea4c7297ee48d24e80b96':
  Use ViewMode in TPL instead of manually checking conv