Enable variant level fallback for {{#property: }}

Change-Id: I181b88fec971c066b9dde7145a85467faafaa02d
Merge "Enable variant level fallback for {{#property: }}"