Merge "Remove dismissal behavior from deferred setup card"