Merge "Only show "add connection" button if relevant" into ics-mr0