Merge "Don't call block checkpoint functions above dm-default-key" into rvc-dev