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

Change-Id: I9cb3e75cdd72592250f755a575c138ecedd3a51b