Merge "UX changes for the cross profile settings header."