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