Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev