Merge "Don't start test apps if not necessary." into sc-dev