am 4b6a829a: am 83a39080: am 1ca9f481: Merge "Fix resumeHomeStackTask can\'t resume home if activity is finishing."

* commit '4b6a829ac2c7af671f131a738437f1e393b13ec6':
  Fix resumeHomeStackTask can't resume home if activity is finishing.