Capability and UI support for merge/swap/addcall

Change-Id: I0d2a9b855028ba2e82e4ffd627389000e3cc1891
5 files changed