Merge "Update app launch tests"