Merge "Improve ANR diagnostics." into jb-dev