Merge "DO NOT MERGE synchronize photo storage creation for race conditions." into lmp-dev