Merge "Fix BufferHubBuffer black screen"