Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev