am 569a271f: am 1fee5522: am dad62b9f: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev

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