VE-861 Properly hide loading indicator and track event when VE fails to load
Rename methods for consistency
VE-861 Rename variables for consistency
Merge in changes from ve-sprint-19
Revert "Merge in changes from ve-sprint-19"

This reverts commit 351b469d7523ec7ea7626d5a6038bcdf036e313d.
Merge in ve-sprint-19
Merge pull request #3774 from Wikia/VE-861

VE-861 Properly hide loading indicator and track event when VE fails