Merge "Switch Tab to DataController" into ics-mr1