Merge "Add logging for long screenshots" into sc-dev