Merge "Guard against native crash due to null Surface" into pi-dev am: a98bb36fed
am: 34dd1000db

Change-Id: I3758948149fb9c50732782b86b2d330e80b94e64