Merge "Revert "Disable Pre-reboot Dexopt."" into main