Merge "Update `Widgets` tapl condition to match the new widget picker." into main