Layout fixes.
Stacked algorithm improvements.
Stacked algorithm improvements.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/res/layout/material_dialog.xml
	src/main/res/values/dimens.xml
	src/main/res/values/styles.xml