themes
Merge remote-tracking branch 'origin/5.1' into gzroms

Conflicts:
	res/values/slim_strings.xml