Merge "Revert "Revert "NPE in TwoPaneController""" into jb-ub-mail-ur10