Merge "Clear cooked state and touch spots when disabled"