Merge "Move media setting to a constant, disabling it" into rvc-dev