Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev