Merge "Data usage label width, locking, Wi-Fi fixes." into ics-mr1