Merge "Fix check for nullptr surface IBinder"