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

Change-Id: Icf4e7f56193e31bf00a8aa80475000399ccd7c20