Same as !1745 (closed), but without the change to skin emblems on the emblem radar, as that will likely conflict with more important merge requests (like !1756 (merged)). Also fixes an oversight that made map completion emblems not get drawn at all in the pause menu.