Bug 540456 - Support HTML5 canvas draw{Custom,System}FocusRing(). r=smaug
Bug 868648 - Make window overlay scrollbars appear/disappear when 2 fingers down/up trackpad. r=mstange, r=masayuki

Credits to Markus for his help getting this right.
Automatic merge