Merge "Pull showStrictModeViolation off of local threads." into jb-dev