Merge "Add logging for Onboarding Bug: 73784423" into ub-launcher3-edmonton