Merge "Fix extra configuration change when unlocking directly" into rvc-dev