Merge "Make persist.sys.sf.native_mode an integer" into pi-dev