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

* commit '221b545cdaba2522fbb299428ac048641410c284':
  Fix issue #18510117: Returning from an activity started with...