[chromium-freeworld/f33] Backport some fixes from the upstream