Merge "Fixing All Apps's getting stuck in a non-updating state" into ub-launcher3-qt-dev am: 8789aa05a1
am: 8474ab2b9d

Change-Id: If1274e88a7cac6c097c8c34bef5e73b2676dcac7