Merge "Allow vendor_init_settable for persist.sys.sf.native_mode"