Replace some valid images lost with the big merge and a pick bug

Some valid images were lost when we merged the github branch way back.
Put those back in and also fix a glyph picking bug.

Change-Id: I003c8485a1dc8ff83b9f2d0f9f69244d150a0ddc
Merge topic 'restore_lost_baselines_and_fix_bug' into master

8cb239bb Replace some valid images lost with the big merge and a pick bug