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

* commit '0fa45d93f7265c130d5dc49a51130ed74db5cec9':
  Remove PendingActivityLaunches based on stack.