Merge "CEC: Prevent overwriting volume control Settings" into rvc-dev