Merge "Add tap-to-add button to widget picker" into main