Unfortunately yes those are different bugs (please open new bugs). But the fix would be similar to this, or similar to bug 1809407.
Unfortunately yes those are different bugs (please open new bugs). But the fix would be similar to this, or similar to bug 1809407.