Merge changes from topic "composer-final-integration" into sc-dev

* changes:
  Rename TelecomManager.EXTRA_INCOMING_PICTURE
  Add support for integrating call composer