Merge "Debugging code to CompatibilityDisplay."