Merge "Disable Pre-reboot Dexopt." into main