Merge "Tweak show/hide of touch highlight" into jb-dev