Merge "Remove gap between tab bar and titlebar" into jb-dev