Merge "Fixing ANR when loader task could run while helding the lock object" into ub-launcher3-qt-dev
am: 88faafd4e7

Change-Id: I1d346260c4b0be99ecd15fbba1644a1c9619236d