Merge pull request #7926 from crdlc/bug-837062

Bug 837062 - Threshold for tapping defined on build time [r=arcturus](cherry picked from commit 3c070039c0818e8dcab45fb90e8743c52e7d8f3d)