Bug 960520 - Set generation id before adding the markers. r=jseward

--HG--
extra : rebase_source : 89fe0e02c0fedc65f111aec0367d70fdc10b787c
Bug 1035998 - Annotate painting with display item information. r=mattwoodrow

--HG--
extra : rebase_source : ca750d2ca943d2596053b9ecf52074c5f5f53e70