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