Merge "Clean up prebuilt stub deps & add comment" into main