Merge "External Display render rate at mode rate" into main