Merge " Failed to show hold call when user click swap and merge simultaneously" am: 017fa0a742

Change-Id: Ic0bca4dbb981c267da4986a9790ac594c6a7201a