Bug 964000 - [Holly] Fix botched UITour merge from mozilla-central. r=Unfocused.