Fix feature abort command handlers.

ag/5483701

Note that we should check if the feature abort is on the message we are
targeting on. There could be some other feature abort show up during the
Action.

Test: manual
Change-Id: Ieac90874595fc3810e0d7a62c06cb113d52323bb