Merge "Make sure to stop noHistory="true" activities properly" into jb-dev