Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev