Merge "Clean up split system user code in packages/apps/Settings/"