Merge "Show carrier name on pin lock screen"