Merge "Improve some sizeCompatMode Tests"