Bug 985867 - Fix touch/click ordering on about:addons page. r=mfinkle a=lsblakk CLOSED TREE
Bug 1003707 - Retain size information for similar surfaces if we can. r=roc, a=lsblakk
Merge beta to m-r. a=merge