Merge "Don't persist device index job across reboot"