cherry picked changes to fix grapher photo border and photo count rendering issues