Merge "Use the correct Frame Rate Compatibility for setFrameRate API call" into main