Merge "Finish crashed activities immediately" into klp-modular-dev