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

Change-Id: I1133759dace1e365516eed5675bea445bdb531e4