Merge "Fix ActivityNotFound crash" into lmp-mr1-dev