Merge "fix titlebar disappearing on tab switch"