Change log update
Merge branch 'release' into upstream

Conflicts:
	main/res/values/strings.xml