Merge "Improve UX of Deferred Setup"