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

Change-Id: I31a829075b828e78ddb0992ee920dbdef7ee31ef