Revert "Single pane for 10" Settings"

This reverts commit 7d4f805dda0670907a95296554ac893555c9521e.
Revert "Revert "Single pane for 10" Settings""

This reverts commit d86b54db0d615aa97da1f7bdfe205ebd47b8489a.

Conflicts:
	res/layout/app_ops_details.xml