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

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