Checklist
- Review https://gerrit.wikimedia.org/r/#/c/160079/
- Review https://gerrit.wikimedia.org/r/#/c/159077/ (loading) after it is rebased on top (it does the same thing for the loading state)
Trello card: LpgjC5oX
- column: Done
- labels: Technical Debt & Refactoring (orange)