Bug 874689 - Re-delete files from merge conflict.
Bug 867193 - Take margin offset into account when positioning form pop-ups. r=margaret
Bug 868998 - Expose the dynamic toolbar after a certain distance. r=kats

Instead of only exposing the toolbar when scrolling from the top quarter of the
screen, always expose the toolbar, but only after a certain distance.