Merge "Check if mSurface is valid before create SurfaceSession" am: fe118cfd10
am: 07eeea788a

Change-Id: I0eb2ab54daa623e97135a149ff34751ef83559eb