Did you get it fixed? I have the same problem
Is going for PWA an option for you? Requires upgrade to Mx9+ and a bunch of testing and rework, but if it is possible and you succeed, you save yourself a lot of hassle at deployments and no more dependency on the Native App Builder. And next release, 9.6, is probably an LTS.
See this doc to see if it is something to consider: