Make color appear correctly on non-standard devices (240x240).

Conflicts:
	res/layout/dialog_color_picker.xml
Merge branch 'jellybean' of https://github.com/GravityBox/GravityBox.git into jellybean