Merge "Add logging to catch rare launcher wipe issue" into sc-v2-dev