Merge "Improving diagnostics when Launcher dies while in ContentProvider call" into sc-dev