v20180125.2 Bundle update with bug fixes.

finish incomplete change to disable drag-based paint mode

The brush was disabled, but painting still occurred with the
previous partial fix.