Merge "Only marking items not already restored as restore" into ub-launcher3-master