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

Change-Id: Ifeff97a2f872c5a18e37c43b8f22b51a25a650d6