Merge "DO NOT MERGE Avoid wifi disable in a UNKNOWN state" into eclair