Merge "Handle null Surface in createVirtualDisplay" into nyc-mr1-dev am: 9103680158 am: e584593641
am: b0b25b6a6f

Change-Id: I6d35f7e1066e8acc243e5ab818e9e36125797026