Makes loading spinner Pajamas-compliant in the
merge-conflict-resolver-app component.

This actually fixes a visual bug as the spinner currently doesn't show
up at all.

Changelog: fixed