Merge "Remove larger preview support for grid preview" into sc-dev