Merge "Fix NPE in ActivityView on surface destruction" into oc-mr1-dev
am: 9352329ee1

Change-Id: I51c19df8f9ad2832102a126778fbc5927d61f094