fixing a race condition on MsgTask::destroy() am: 4eda8e1eab
am: 4797bfa900

Change-Id: I0896a4c0c3bd5fe2d63c1d7c1a4f27976e917842