Merge "Enable greater control bar customization" into rvc-dev