Fixed callingController is undefined in dashboard view
Merge branch 'develop'

* develop:
  Fixed callingController is undefined in dashboard view