Merge "Fix memory leak in LocalActivityManager. Also properly removes embedded activities. Bug #2738247"