Merge "TitleBar refactor"