Merge "Make sure Layout doesn't modify the paint"