Fixing tooltip reposition bug on window resize
Merge branch 'dev'