Merge "Fix statusbar display of wifi signalstrength" into gingerbread