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

* commit 'ff9e6d67ae27132bd3cd3cf767d9a7ec6e864772':
  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.
tree: 1a00e342fb237760c9ea9d3bca3262eaea5a39ad
  1. InCallUI/