Merge "SurfaceFlinger::getNewTexture: Don't deadlock on main thread" into sc-dev