Update default.xml
Merge remote-tracking branch 'origin/coron-4.2' into coron-mtk-4.2

Conflicts:
	default.xml