Merge "Move initial ZenMode query to background" into main