Merge "Improve exception error messages to help diagnose app errors" into jb-mr2-dev