Merge "Fix 5247983 posted photos from multiple accounts showing up in same folder"