Merge remote-tracking branch 'legacy/kitkat' into kitkat

Conflicts:
	configs/themes_common.mk