Merge "Screenshot to long screenshot shared transition" into sc-dev