Merge "better fix for [2420565] Surface.lockCanvas() updates the dirty region too often" into kraken