Merge "Fix issue with cleaning up stream item photos."