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

Change-Id: I0ae3a521787e52f8cf0dd99a64bdc69461c58df1