Merge "Fix NPEs related to combined view." into jb-ub-mail-ur9