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

Change-Id: Id260b2a83f2dfaed792177207f52105231347ead