[Git][ghc/ghc][wip/apk/unfold-dicts] 2 commits: Make T27225 test more stable.