Revert "NPE in TwoPaneController"

Since this one depends on the hierarchical folder change that is being reverted.

This reverts commit 9e288454da3c6c63d866252f521911b60adce2f2.

Change-Id: I363982790348c77b2dbd63b59a0b44c9016db257
1 file changed