Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1