am 7f8ce7c9: Merge "Revert "Revert "NPE in TwoPaneController""" into jb-ub-mail-ur10

* commit '7f8ce7c946b28c2d4ef238fa43d0cf101b53cb21':
  Revert "Revert "NPE in TwoPaneController""