Merge "Update long screenshot crop per mocks" into sc-dev