WINKSTART-1106: Fix crash with current call, and display caller id when possible
Merge branch 'WINKSTART-1106'