Merge "Make setup_pred_block subsampling-aware." into experimental