Better font size control

Change-Id: Idde7c08f655b0a11382c8af5a9a3d395ce655718

Conflicts:
	res/values/attrs.xml