Explanation

This PR addresses #6907 (comment) and #6907 (comment)

Checklist

• The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
• The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
• The linter/Karma presubmit checks have passed.
  • These should run automatically, but if not, you can manually trigger them locally using python scripts/pre_commit_linter.py and bash scripts/run_frontend_tests.sh.
• The PR is made from a branch that's not called "develop".
• The PR has an appropriate "CHANGELOG: ..." label (If you are unsure of which label to add, ask the reviewers for guidance).
• The PR follows the style guide.
• The PR addresses the points mentioned in the codeowner checks for the files/folders changed. (See the codeowner's wiki page.)
• The PR is assigned to an appropriate reviewer.
  • If you're a new contributor, please ask on Gitter for someone to assign a reviewer and don't tick this checkbox.
  • If you're not sure who the appropriate reviewer is, please assign to the issue's "owner" -- see the "talk-to" label on the issue. Do not only request the review but also add the reviewer as an assignee.