Merge "Never call app_main more than once"