Merge "Follow-on fixes for long screenshot activity" into sc-dev