Merge "Do not enter resumeTopActivity recursively." into klp-dev