Merge "Update app launch tests to new DSL format" into sc-dev