am 355398f9: Merge changes from topic \'mwd-merge-050415\' into mnc-dev

* commit '355398f9b4abecfa18aa65888d2303a8eda823ac':
  VT related cleanup.
  Fix memory leak: remove a listener
  DO NOT MERGE Fix missing "manage conference" option.
  Upgrade / downgrade requests
  Incoming video calls - accept only 2-way calls.