Merge "Put PLMN and SPN on one line in the notification panel." into jb-dev