Merge "fix the issue widget id can be wrong after restore" into ub-launcher3-master