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

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