Merge "App launch - Test app changes" into nyc-dev