Merge "Handle transitining out of overview more gracefully for 3P launchers" into sc-dev