Merge changes from topic "multi-resume_with_fix"

* changes:
  Don't make active activities that are launched behind
  Multiple resumed activities