Merge "Adjust callbacks on handler thread." into sc-dev