Merge "Concurrent displays: adding render rate sync" into main