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

* commit 'd88e4d50d6198233883a69313fdee2c1a6fff7ca':
  ActivityView: set surface on a background thread.