[automerger] Moving some swipe up complete logic to when the handler is completed. am: 0bbacc705c

Change-Id: I45b0e91cd195750e46889030a40ac4e4b2489c26