Merge "Throw a better error message when the automatic onClick handling doesn't work."