Merge "Be less aggressive when not resuming top activity" into klp-dev