Merge "Do not kill ANR-ed debugged application" into main