Merge "Stop using persist.sys.time.offset" into main