Merge "(bug 39273) add diff support to LivePreview"