Merge "Fix issue with restored task display ids" into ub-launcher3-qt-dev
am: 57ffdc4ec7

Change-Id: Ia8bcd6ffdba37f768457b3c2081d3e5a4bb1bb36