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

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