Merge "Fixing issue with removing tasks immediately after boot" into ub-launcher3-rvc-dev am: c505a95aaf

Change-Id: Ib1e5bb7d2ad156d582163c7602ed2182d476844b