We should refactor this listener hell to use LiveData at the next opportunity...
Closes #1643 (closed)