Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev