Revert "Revert "Single pane for 10" Settings""

Breaks the build.  will sort out whether this is even worth it or not later.

This reverts commit 8123026517897663c0c7a3edd109a9131c2d1faf.

Change-Id: I41ba3466a438d8d95acc6a6094cd9085d6962cf8