Merge "Titlebar on phone UI update"