Merge "Restore public visibility of onRefreshRateSettingsChanged" into udc-dev