Merge "Fix the preference index conflict problem" into rvc-dev