Merge "Merge "Check if mSurface is valid before create SurfaceSession" am: fe118cfd am: 07eeea78" into pi-dev-plus-aosp