Revert "Single pane for 10" Settings"

This reverts commit 56f51a8927f53bee81145fe29e63af8a87e6fd1b.

Change-Id: If5c7be247caeeb4ec3e0bceed86bc5763d74f927
Merge branch 'cm-11.0' into martincz