Merge "Update Inet Connection Status display" into gingerbread