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