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

We want this. Build worked fine last night on my phone. Figure out the error and FIX it.

This reverts commit 9248a43d503a3e6d29b79430bb38bdf509f91e40.

Change-Id: Ia94b6620127e8ed7b5769041392574e2b0993c92
Merge "Revert "Revert "Revert "Single pane for 10" Settings"""" into kk44