Merge "Remove deprecated methods from ToolbarController" into rvc-dev