Merge "Fix NPE in ActivityView on surface destruction" into oc-mr1-dev