Bug 875441 - Don't keep reapplying the 2x scale in HiDPI mode when drawing the titlebar buttons. r=mattwoodrow
merge m-c to fx-team
Bug 820738 - clearHistory() in about:newtab tests should wait for places-expiration-finished; r=mak