Merge "Remove long screenshot flag" into sc-dev