Merge "Make control panel black" into rvc-dev