Merge "Small fixes to screenshot->long screenshot transition" into sc-dev