Merge "Update two pane sheet widget picker to use RelativeLayout since ConstraintLayout was causing test failures" into main