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