Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev