Fix My Friends counter in sidebar
Merge branch 'MH-582' into dev