Style changes - dimensions
Style changes - dimensions

Conflicts:
	app/res/values/dimens.xml

dimagi/commcare-android,dimagi/commcare-android,dimagi/commcare-android,dimagi/commcare-android,dimagi/commcare-android,dimagi/commcare-android