Merge "Fix the stream item layout"