am 4cabbef8: Merge "Make sure to stop noHistory="true" activities properly" into jb-dev

* commit '4cabbef8266c909997cf608d008920f5a2f49937':
  Make sure to stop noHistory="true" activities properly