Merge "Fix bug #3077713 (Account Sync status is sometimes not reflecting the real status)"