Merge branch 'emblemexitfix' into 'next'

Only Award Bonuses / Record Attack Emblems from Physically Beating a Level

See merge request !2161