Merge "Keep Add and Done visible as secondary buttons when a widget is selected" into main