Merge "Don't remove background task immediately on screenshot service end" into main