Merge "Update Service#onTimeout implementation." into main