Attempting to cherry pick multistate LED on the 3.2.x branch