Merge "Remove the specific UX of Deferred Setup card"