Merge "Fix issue #17082301: replacePreferredActivity is ignoring userId" into lmp-dev