Merge "More temporary logging to diagnose testPendingWidget_autoRestored" into ub-launcher3-master