am e2b8bd72: am 16c32207: Merge "Do not enter resumeTopActivity recursively." into klp-dev

* commit 'e2b8bd72bd325de9c258fa9c8ef4143420796614':
  Do not enter resumeTopActivity recursively.