Merge pull request #9565 from mikeller/switch_sbus_to_generic_frame_time