Merge "Fix path for default prop"