Merge "Back from the dead: Carrier name, background dimming." into jb-dev