Add image toggle tapped quickly bug

The welcome message could get out of sync in this case
Merge remote-tracking branch 'monte/visualOnFirstLogin'