Merge "Issue 128554727: no merge option when press merge and swap buttons simultaneously."
am: eb0a870e45

Change-Id: I33247276dac5796ad660a7e25e2db62348d8cef9