Merge "[Dev options] Use Android.os.SystemProperties instead of java.lang.System.setProperty for caching toggle overrides." into main