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

* commit 'bc83dec6da0b6d326c00ff531bbe8447b62abbb9':
  Revert "NPE in TwoPaneController"