Merge "Remove surface legacy APIs and code." into ics-mr1