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

* commit '16c3220734f3cbf32c0148d82815d93e2f28af65':
  Do not enter resumeTopActivity recursively.