Merge "Fix customizer state" into rvc-dev