Merge "Defer cleaning up screenshot until after we actually switch to screenshot" into sc-dev