am 09875ec7: am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev

* commit '09875ec7292b19e07c38b6127406d6aa7490e26c':
  Remove PendingActivityLaunches based on stack.