Merge "Fix votePreferredFrameRate_infrequentLayer_defaultHigh test" into main