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