fixup
Merge remote-tracking branch 'upstream/kitkat-staging' into kitkat
Fix crazy lab
Conflicts:
	res/xml/hover_settings.xml