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