Merge "Fix function setting failed in Developer options" into rvc-dev