Merge "Disable wimax when mobile data is in Settings" into ics-mr1