am f7ec4e61: Merge "Never call app_main more than once"

* commit 'f7ec4e61ebde9ff6d4934bd398e9ef8a39e4c28b':
  Never call app_main more than once