Merge "Logging state change events when in test to simplify diagnosing" into ub-launcher3-master