Merge "Change lockscreen text from "Emergency call" to "Emergency"" into tm-dev