Ticket0659: Clean up user experience for the syncing flow