Merge "Fix incorrect task index bounds" into ub-launcher3-qt-r1-dev
am: 3bbb20262b

Change-Id: I59dee8f9906b43708f9c4ec7e033f469cc660c3c