Merge "Fix issue with loading profile photo."