Merge "Use locale text direction in keyguard carrier text" into pi-dev