Merge "Ensure onZenDataChanged is triggered from main thread" into main