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