Merge "Bug fix: Use JVM signature for custom views"