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

Change-Id: Ib077f59f72375094737bf6331cfea79a449d2142