Merge pull request #6502 from Aamod007/fix/electron-zoom-persistence-3948