Merge "Separate and add more SizeCompat tests; add Display Builder"