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