am 1b59c401: am bdd89eed: am d91f9c7e: am 6ede9b67: am 26b0f1e4: Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev

* commit '1b59c401c381ecaca5109cf68c65ec56fa3fe8d6':
  Revert "Finish already paused activity if it should be finished after pausing"