Merge "[Dev options] Remove the use of java.lang.System.setProperty" into main