Merge "Ignore the reboot to normal intent when DSU is locked"