Revert "Revert "NPE in TwoPaneController""

This reverts commit 4f6e5f4e1e842f3f0552b673626c6d4bceaf1641.

Change-Id: I4e450e20110d06aa252168ecf573edc692a90db1
1 file changed