am 80978d8d: Merge "Fix NPEs related to combined view." into jb-ub-mail-ur9

* commit '80978d8d761156b75453bba3bce5cfc66ec346f2':
  Fix NPEs related to combined view.