Merge "Move Carrier label into universal status bar header."