Merge remote-tracking branch 'base/remix-staging' into legacy-staging

Conflicts:
	core/res/res/values/config.xml
	core/res/res/values/pa_strings.xml
	core/res/res/values/symbols.xml
	packages/SystemUI/res/values/pa_strings.xml