Merge "Provide default fallback in theme" into nyc-dev