Merge "Show one name if both plmn and spn are equal" into lmp-dev