Merge "Guard against native crash due to null Surface" into pi-dev