Merge "Align carrier info for glowpad keyguard screen" into jb-mr1-dev