Merge "Restore verity state when verified partition is reflashed"