Follow up on Bug 1057977 - [Status Bar] Remove AM/PM indicator

Conflicts:
	build/config/common-settings.json