am 4d3448db: am 4cabbef8: Merge "Make sure to stop noHistory="true" activities...
am 4d3448db: am 4cabbef8: Merge "Make sure to stop noHistory="true" activities properly" into jb-dev
* commit '4d3448db':
Make sure to stop noHistory="true" activities properly