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