Merge "Reset deferred task removal when app token added." into klp-modular-dev