Merge "DO NOT MERGE Fix wifi status icon" into gingerbread