Merge "Fix bug where preview item icon fades/disappears for a frame during" into sc-dev