Merge "Revert "Explicit registraton to refresh rate"" into main