Merge "Fix help outline icon on Retina" into emu-master-dev