Add temporary new spinner to footer.
Resolve merge conflicts.