Merge "Resolve race condition by guaranteeing that onDestroyed is first on the right queue" into sc-mainline-prod