Merge "Ignoring crash if the 3p icon surface is no longer valid"