Merge "Update the network unavailable message when selection fails" into nyc-dev