Merge "Surface: don't hold mMutex when queuing buffers" into main