Merge "Consistent handleApplicationStrictModeViolation."