Merge "Pull out FrameRateCompatibility definition to avoid circular dependencies" into main