Bug 943317 - add a timer for expiring disableTap, r=crdlc

(cherry picked from commit e95ac024020604d71f50c8d33f1fd669d17b031e)