Add back dual pane settings for tablets

Change-Id: I1f29e20470e74c1c1d24e5fdd4de7c33d0d6b4e6
Merge "Add back dual pane settings for tablets" into jb4.3