I haven't had much luck with this issue to date, but I've started looking at it again in hopes that I can get it resolved.
I can still reproduce the problem with the information you provided. However, I still see the issue when using the upstream version, too. Can you provide the build settings/steps that you're using for the upstream version? Thanks!