Merge "Detect interrupted update due to power off"