DO NOT MERGE: Keep old callback thread

Discrepency between documented and delivered thread in prior versions
got confused. Switching back to the main thread for delivery when not
specified.

Bug: 160565229
Test: presubmit only
Change-Id: I6deaf08e2045771c120aa2eb35c64b392208bd58