Merge "Change path for DefaultSelectionToolbarRenderService"