am efb4a3f6: am 061846d1: am ec565efe: am eb2153c7: am 093d8de2: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev

* commit 'efb4a3f6d2f77e6fff62b2c6f83c5c8497dc133c':
  Finish already paused activity if it should be finished after pausing