A few fixes.

Change-Id: Ic6cdc284ba40cb836340b6f8b5c0badb9ffafa26

Conflicts:
	src/com/crom/settings/fragments/StatusBarClockStyle.java