Merge "Remove FrontendSettings.Builder" into rvc-dev