Merge "Remove activity without process before killing from force-stop"