Merge branch 'master' into release-support

Conflicts:
	settings.gradle
Updated slider layout.