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