Merge "Handle null Surface in createVirtualDisplay" into nyc-mr1-dev