Merge "Catch DeadObjectException to avoid crash" into main