Merge "Switch away from std::async for proximity-active callback." into sc-dev