Merge "Failed to show hold call when user click swap and merge simultaneously"...
Merge "Failed to show hold call when user click swap and merge simultaneously" am: 05a5c1f1 am: cc52e13b am: a5c26254 am: 1b8cf191 am: 3d9616e9
Change-Id: Iea11b5c193f30732bae784ee780dc71da7af4529