Merge "Include more error logging for widget restore" into ub-launcher3-master