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

Change-Id: I8533b4012d80e22d06f84acf8c8293db21a6773c