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