am 8488f9fa: Merge "Be less aggressive when not resuming top activity" into klp-dev

* commit '8488f9fa2e38e75e7ecbaac7d776900f8f1e5917':
  Be less aggressive when not resuming top activity