Bug 998044 - Fixing a bad merge causing the CallScreen to be init twice.
Merge pull request #18529 from etiennesegonzac/bug-998044-init-bis

Bug 998044 - Fixing a bad merge causing the CallScreen to be init twice.