Force intents to start in app wherever possible
am: 41c6886cab

Change-Id: Ic45640a041a13f1487d68e304c8bbc3b6a6f4c90