[CLC-1693] Don't block badge display due to ajax call
Merge pull request #976 from yuhunglin/CLC-1693

[CLC-1693] Don't block badge display due to ajax call