Merge "fix titlebar position when focused"