Merge "Fixing widget restore" into ub-launcher3-burnaby