Refactor for separated titlebar change.
Fix for persona offset when PersonalTitlebar is in use.