Bug 943317 - add a timer for expiring disableTap
Merge pull request #14594 from evelynhung/issue-943317-v1.2

Bug 943317 - add a timer for expiring disableTap