am 50576fa8: merge from open-source master

Merge commit '50576fa8152557a25e1a231c66d694fffbab34d6'

* commit '50576fa8152557a25e1a231c66d694fffbab34d6':
  Start app with several activities with intent filter [Main, Launcher] was broken