Merge "Prevent crash when activity is no longer running" into lmp-mr1-dev