Merge "Fix tabs spinner size" into jb-dev