Merge "Return the correct roaming status when check isNetworkRoaming()"