Bug XXXXXXX - Part2: TB v2.2.5 lib tweaks to make it work for FxOS