Merge "Make SipService listen to WIFI state change events." into gingerbread