Merge "Move CEC volume control setting to CEC config"