Merge "Ensure app widget ids are restored after database is sanitized." into ub-launcher3-qt-dev