Merge "Properly remove activity from task on start failure." into pi-dev