Merge "Show add button when WidgetCell text is tapped" into main