am 093d8de2: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev

* commit '093d8de298c258943ca79c1cf429f5ef5725d1bb':
  Finish already paused activity if it should be finished after pausing