Merge "Remove unused development setting" into rvc-dev