Merge "Protecting against trying to launch apps that don't exist" into pi-dev am: 9b8b54f9f6
am: c5a792ae68

Change-Id: I13042ccc50a933c86e0f80a116c650ef2c71ad0b