Merge pull request #9343 from vinzv/9337-fix-pwa-manifest