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

Change-Id: Idddb9ec29f55f9e1ad0e461276afd459f165e821