am 7ece27cf: Merge "Fix stablity issue when PeopleActivity is trying to stop." into klp-dev

* commit '7ece27cfa8871e706ef2ebbeed04e6eaeddab753':
  Fix stablity issue when PeopleActivity is trying to stop.