Merge "Rename enableSafeMode to setSafeModeEnabled" into main