Merge "Move media setting to a constant, disabling it" into rvc-dev am: 2d8266cd am: 926a823c am: a52c123e Change-Id: Ib6ac90d8d0ff5f279dae6da8b4ad4e9d18eeb4cf