issue #20864: reorder grid components, and allow tab navigation between rows