Merge "Fix messaging for sync now feature, when no account is selected"