Merge "Improving diags for launching an app." into sc-v2-dev