Merge "Fixing unrelated icons getting removed during sesison failure"