Updated according 4-23 nightly
Conflicts:
	res/values-ru/strings.xml