Merge "Fix smart_linkify_enabled flag." into pi-dev