Fix for MPLY-4355

Use the default (now correct) platform coverage tree / environment theme manifests.

Buddy: Jonty D
Merge branch 'master' into reduce_samples_dryfail

Conflicts:
	ViewController.mm