Merge "Merge \"App launch - Test app changes\" into nyc-dev am: 8fabbb89c0" into nyc-mr1-dev