Merge pull request #8801 from crdlc/bug-854397

Bug 854397 - [Facebook] After authentication in FB, sometimes import and...(cherry picked from commit 0e1ed1a26c58f1cf308d26d62b76b0ead3f82860)