Merge "Add FrameRateOverrideMappings unit test"