Updating various task callbacks to handle overlays Change-Id: I80077508ad35c31269c873f51f0105302a9e6a5d