Merge "fix [2615973] ViewRoot locks the Surface even when the dirty region is empty" into kraken