Merge "Protecting against trying to launch apps that don't exist" into pi-dev