Merge "Add lock before calling initEglImage"