Merge "Title bar tweaks"