Merge "SF: Min layers should not choose a frame rate override"